Merge "Add @UnsupportedAppUsage annotations" am: 3b358c7c6d am: 79a76542d3
am: a20f0f5d88

Change-Id: Ie779bc690cef30f1636402a016f7c6eb685755cd