Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev