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

Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9