Bug: 34135607 Test: hals work Merged-In: I6a1f87438bb5b540fce900e9ec5df07d3f4f6bd4 Change-Id: I6a1f87438bb5b540fce900e9ec5df07d3f4f6bd4
Test: manual Bug: 32021609 Change-Id: I6793794f3b1fb95b8dd9336f75362447de618274