Android 5.0.0 release 6
am 0656acf7: am 55aebda6: Merge "Update the tests to 0.12.2" into idea133 automerge: 601e801

* commit '0656acf71ab5045a4845a74e9e8c53874ce196fc':
  Update the tests to 0.12.2