Merge "Don't hold AM lock during assist data request." into pi-dev