Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e
am: dc5ad0b6e6

Change-Id: I9db0c8e41bf5b7783ee23bb82ac9d957472427db