Merge "Private API became public..."
am: eb44ebbfcd

Change-Id: I9ec4e8bb8609a29ed48d2862913c007d8f4e83c6