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

Change-Id: I70bdeb6326a5f1eaa531f9eaad3ab90175eb8622