Merge "Add @UnsupportedAppUsage annotations" am: 5d256870aa
am: 42f62d86b5

Change-Id: I43315449d7354eafcc818350890447d1f494ba27