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

Change-Id: Ie8df4dfa0edb318c86d0605f1a0bd7df248629ca