Merge "Disable testMapsApp test due to a UI bug. Test: Local Change-Id: Ie10b304eba978902d008aa7dc6bf948268c7b7d1" am: 820dd34f1f am: 7ab63c2204
am: 6d813b9c64

Change-Id: I43231f4e476be4e2080b09a930cc8f3136d397f9