Merge "Add @UnsupportedAppUsage annotations" am: cf03906edc
am: a25b4e8c07

Change-Id: Id5ba379057d3874b78391c312cfb903799617d81