Merge "Emergency Function HAL (continued)" am: f461463b39
am: a22dacfc17

Change-Id: I92f027462f8dc954bfa350d06d99b2472d4ca8e5