Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f
am: 7a10fd6a47

Change-Id: I9af4cf36f02d6da12aee1ed8a74b5fe2f2a83a65