Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into...

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c59 am: eda0b007 am: 71e62a40 am: 50366111  -s ours am: 4146229e am: 0bf28260 am: 0326b807 am: d478287a
am: a29c7c77

Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15