Merge changes from topic "mockito-dexmaker-update-revert" am: ae3172e5fc
am: 3a0e7c2c89

Change-Id: I2450d9ee7788af230d92b402408875fc74fbd422