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