Merge "Switch to metalava" am: 806939b1b1 am: 97466ef516
am: 79bdaeb839

Change-Id: Ia3849d35e85b66c049922fb092ca6e41f6c9aab4