am 7c5ce400: am 8e7a52d8: am 018014e6: (-s ours) am 5007744e: am d326b4f4: am b3405de8: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev

* commit '7c5ce400a601390114b25478632ebb22f4793866':