Merge "Add @UnsupportedAppUsage annotations" am: 44091cdb47
am: ec3f7c80ce

Change-Id: I50594b690a776145e4b0278e1e0685c5ebc53832