Merge "Add @UnsupportedAppUsage annotations" am: 78f8ffbffd
am: 2d86f12796

Change-Id: I8689045812cf0d2d64ca35327319c34a7cc387d0