Merge "Add @UnsupportedAppUsage annotations" am: d9381f5e56
am: e2a6ad99ae

Change-Id: I3a0236e8388f7f5448a10873a3e0f0ca502fa625