Merge "Add @UnsupportedAppUsage annotations" am: 14dea1f70c am: 2603ad7576
am: abe219f635

Change-Id: I0679cc316762693dc0e43a78ec0ab6146946ef86