Merge "Pick private APIs from all classes" am: cc8c74cd12 am: 5bd576acfe
am: 9c1c659d5e

Change-Id: I9bab034172604d2e593abba2f7a844113272b64b