Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf932)
Change-Id: If90690d6234dc8727df2b2fb485f0c8d50970a92
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf932)
Change-Id: If90690d6234dc8727df2b2fb485f0c8d50970a92