Merge "Add serialization methods to hidden API light greylist" into pi-dev