Bug: 205760652 Test: Build & flash Change-Id: I2709c5cc2ca859481aac6fecbc99fe30a52a668b Signed-off-by: Sandeep Dhavale <dhavale@google.com>