Merge "Add @UnsupportedAppUsage annotations" am: 792fb35cee
am: 8f2e5344be

Change-Id: Ic37a31fc6bd855209003de26489a4c491dc80291