Merge "Switch to metalava" am: f53c398133
am: d1eae3244e

Change-Id: Id94c3df35f9939c7f3b759d048affe7f22fa6e24