Merge "Move hidden API warnings into resolvers" am: 70e88d6df6 am: 8c0c03fc51
am: 38b4f37ea9

Change-Id: I570dfd88531e815b94788995b047e1b1de6adb39