Merge "New API to clean up all inline mocks after test" am: 14b2099e7d
am: ea4ceca29c

Change-Id: I0e4b276e251e3d4050e3e4004d974381396a9b28