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

Change-Id: Ibaac9f7e75429b86843325fcc4f4d9ecbab777a8