cf38c65dc4
Bug: 184696445 Fixes: 184696445 Test: Local build and flash Change-Id: I950a08b1528ba983157615f99c21f06de220d414