Merge "Add @UnsupportedAppUsage annotations" am: f336c03135
am: 230017d9b9

Change-Id: I83890c9c7aaa24030f7744276d793249e17ad7c6