Merge "Don't greylist public bridge methods." am: 9229d6e84b
am: f40115456e

Change-Id: I6f7781e9e58aba1201fc2b4602d92181fcbaa52e