Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee8718 am: de1246acf9

Change-Id: Id2a6ffc33f0c31bcdf027ae63ad9dac2bcf9cd59