Merge "Remove @UnsupportedAppUsage annotations from generated code." am: 30ea09ab75
am: 37d1e21614

Change-Id: I4f4e917c2cf0460f0689006bc1bb5495c0fad061