Merge "Increase arbitrary wait for boot. am: c4dd18f81d" am: b80edd7c50 am: 9fa13f1052 am: 7c89141299
am: eb2be7e778

Change-Id: Ief2e37af4e3c2b5033b99205ba740de7a6f75095