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

Change-Id: I3ba91d555ffe267bf1cc2b0141e0f97b23df2ac5