Test: built and booted Bug: 150040815 Signed-off-by: Maciej Żenczykowski <maze@google.com> Merged-In: If80758b3d7bf499d428880efa5ed555076bfc291 Change-Id: If80758b3d7bf499d428880efa5ed555076bfc291