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