Merge "Add uses on marlin to hidden API light greylist" into pi-dev