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

Change-Id: Ibd56ba7fd9ef20dd94072aa8f22235f22d56cbf6