Merge "Fix EmergencyAffordanceService" into rvc-dev am: 87adee8718 am: de1246acf9 am: 004584f595 am: d7f4ef17e3
Change-Id: Id69ffb590d3e2a717d83d3e8f7a135f4e7fa4903
This commit is contained in: