Merge "Test migration of EXTRA_OUTPUT to clipdata." into lmp-dev