Merge "Mockito: Downgrade Errorprone warning" am: c3b72fb406
am: 770459fdda

Change-Id: I6a5a2298fccd368b3041f067255d66b017745a8e