Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77 -s ours am: 20307881d7 -s ours
am: e58f1e5965
Change-Id: I483d2f52d347d2fb0064a6f9a0e6db3d5a61aa67
This commit is contained in: