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

Change-Id: If6bd8a784514916f4fd47c186c0b9bbf04329be6