Merge \\"Allow trust agents to run during provisioning\\" into nyc-dev am: 1dd403b61a
am: 30181fb1b9

Change-Id: I52ae4de09bb61242f5e61758b1eea78a597adf2d