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

Change-Id: I6c0105193a38b477fdfa7e8b88343bd5b8bb2f14