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

Change-Id: I1f631ccb5b48380324e6d8818f4c5fb02cae2f15