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

Change-Id: Ia94a8b7630ca5d3843e08d1e900db6b7f7a93978