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

Change-Id: If88a87edf7bad91dce0e91a16d1838441a69b77a