Test: Builds and boots. Change-Id: I99a9ed79666e143b47f02ca4e59eed94f69b7e4a (cherry picked from commit a981e2e52e)
a981e2e52e