Merge "Optionally append managed service approvals" into oc-dr1-dev
am: 445a6d42ef  -s ours

Change-Id: I8f4d84a128cbdca8e4a9c9e330765b324569bd1c