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

Change-Id: I98065c77e2d510de24ea6a85a7e9cef6603e153e