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

Change-Id: I97987343ffecb6f6f2340d53931f194b2083c1be