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

Change-Id: I70367f6037761477dee69f0a4a89b22efe4bf7ba