Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev
am: d527cc199f

* commit 'd527cc199f4f0a22f594b4e48a70e0909ae7caf1':
  MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue