Merge "Improve @UnsupportedAppUsage docs." am: 71e365023e
am: 536747c852

Change-Id: I154caddad444f2a7c6504e970970970022bd39d5