Bug: 73711752
Test: make droid && flashall
Merged-In: I28ac1544c20bc3e8abb4341aa331c212f16301f0
Change-Id: I28ac1544c20bc3e8abb4341aa331c212f16301f0
(cherry picked from commit 0c57079427)
Bug: 73711752
Test: make droid && flashall
Merged-In: I28ac1544c20bc3e8abb4341aa331c212f16301f0
Change-Id: I28ac1544c20bc3e8abb4341aa331c212f16301f0
(cherry picked from commit 0c57079427)