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

Change-Id: Id441e551314a5b14a7cdfaa3570cddc8d6bb94ef