Hide public API modification

Change-Id: If9b9da59b63d195f8179e7044fcaa7b55c53d8d6
Merge remote-tracking branch 'cm/cm-11.0' into HEAD