Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours am: 00c553e1ba -s ours am: 8f681f7220
am: b05ceb233e -s ours
Change-Id: If0087103642b7ff1907665711c4a5821ac8beff4
This commit is contained in: