Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee8718 am: ca44db4111 am: b8a1da7d1c am: 5a579a2c3a
Change-Id: I2f90038583be44980c8010775b6395b9f4e87de4
This commit is contained in: