This patch fixes 3 issues: - "RuntimeError: dictionary changed size during iteration" - "TypeError: 'map' object is not subscriptable" - "TypeError: object of type 'map' has no len()" Change-Id: If52ab336512f37b6e5ad6c748bef7996c67cb71a