Merge "Add annotation for hidden members used by apps." am: 78368234b2 am: b4b293b0ec am: ac1eece91c
am: e9104023d8

Change-Id: I518875909263ae2102f1aa8578fdfe5107f5cd60