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

Change-Id: Iefbdf179cfb2ba47539a0b75131411f5c7722c50