Merge "Merge "Changed comments to match real protection level" into qt-dev am:...
Merge "Merge "Changed comments to match real protection level" into qt-dev am: b23292da am: b6037762" into qt-r1-dev-plus-aosp
am: df0f980d
Change-Id: Ic415a7a514d280a3f035690800d6617d556a94ef