Bug: 36463595 Test: Build and boot. Change-Id: I245d1755546fa597e941badce251c2e8293e998e Signed-off-by: Sandeep Patil <sspatil@google.com> (cherry picked from commit 52b20877dc)
52b20877dc
(cherrypick of 8ad0e66e77c795d11e9cd5c7b576eed0da60537e.) Bug: 36463595 Test: builds Change-Id: I700700abb4de76017a2ff811ceff19ea2ee86eb2