Merge "Update boot image profile to include Object.wait()" am: ba0b212a33
am: 0d68d68b39

Change-Id: Ic49e46c6930729c12673177d0ba29d15e47e6168