Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee87 am: de1246ac am: 004584f5 am: d7f4ef17 Change-Id: Id69ffb590d3e2a717d83d3e8f7a135f4e7fa4903