Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c50
am: 582d18c02b

Change-Id: I234e49acdcb99b7ca0aa4574b6af38d10947a592