Merge "Add @UnsupportedAppUsage annotations" am: e84b5dc01f
am: a24340805c

Change-Id: I380f03fe0c949920c14f7c419aa4f596e3d4e232