Merge "Add @UnsupportedAppUsage annotations" am: 2bbb9c537e
am: 54fe34c359

Change-Id: I0cc71b9f2d65f0c8b63410f66106429799c4cd45