Merge "Add @UnsupportedAppUsage annotations" am: b558baa4cc
am: 1b7a5028a0

Change-Id: I45db75d8ca19decae25cd99ddf842322c28d5b10