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

Change-Id: If34c2a1b722e026f7dabf59f9893937d97250373