Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee87 am: de1246ac am: 6f5ebda3 am: f062c6c0 Change-Id: I455fcb8f1c43e8ecd4e3726f31229403a5975a86