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

Change-Id: Ia4c629a73124cc6d946959d66d621395938fc443