Test: Builds and boots. Change-Id: Iad97159e6193f7afffd8fbc9456427eee5d150e3 Merged-In: Iad97159e6193f7afffd8fbc9456427eee5d150e3 (cherry picked from commit 1f16b275)