Merge "Update golden manifest after permission change." into oc-dr1-dev
am: b146710558

Change-Id: Ic5739b41c63104e2a0096369c2ef23a7136d7de4