Merge changes from topic "atp" into tm-qpr-dev

* changes:
  Sets up Robolectric tests to run as presubmits
  Ignores failing test soon to be removed