Merge "Add serialization methods to whitelist not light greylist"
am: f7190b65ab

Change-Id: Idecb27314ecbdea74354afb4f320eda124bfc72d