Merge "Add @UnsupportedAppUsage annotations" am: 9513a9e215
am: 5e2a54ab19

Change-Id: Iab4a59a3cdc6aa5387b015f749713538ad66c9db