Bug: 162791243
Bug: 72471476
Test: build and using emul temp/running burn8 to verify it
Change-Id: I5ca475be8b73b940e4858634595a7918ae92f6ef
(cherry picked from commit 35e110fe669a7d2996ce503d7e31204554f972e3)
Signed-off-by: SamarV-121 <samarvispute121@gmail.com>