Merge "Private API became public..." am: eb44ebbfcd am: 85fc4d6dd6
am: 746a738276

Change-Id: Ifb1fd8dc812d160cd998ba23371e0cfff0c43adb