Merge "Add @UnsupportedAppUsage annotations" am: b40b37910d am: 4a8c67bbe8
am: e7b3423bcd

Change-Id: I459511756147dc164ed4f909ec52afcc0a484826