Merge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee
am: 02f43694e4

Change-Id: Id5e95d173ab7c2595ae148f73d3d7381b0ea8226