Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee87 am: ca44db41 am: b8a1da7d am: 5a579a2c Change-Id: I2f90038583be44980c8010775b6395b9f4e87de4