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

Change-Id: I9ccfc88dc7d86462e323e32ce2b13726e05ec1c3