Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev