[automerger skipped] Merge "Remove @UnsupportedAppUsage annotations from generated code." am: 30ea09ab75 am: 37d1e21614
am: c4ac7e0c3f  -s ours

Change-Id: If1fd203489e3138371669d7bdc748b9fbc69826e