Merge "Optionally append managed service approvals" into oc-mr1-dev
am: d87e79aae6

Change-Id: I1f36654acb688769014fc1271fcc0e258f848466