Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev automerge: b3405de  -s ours
automerge: e711a36

* commit 'e711a36ecd858e5dd6ba504473d9fbba52fee6e8':
  DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail