Merge "Merge "Merge "Increase arbitrary wait for boot." into nougat-cts-dev am: 9804a4532c" into nougat-mr1-cts-dev am: eb64199092"