Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev am: f7771c9f77
am: a17abfef56

Change-Id: Idf89c63e91b0677799b3b48aff3f19fd08792998