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

Change-Id: I268f643293c10048cc80e33e39573c3e04c2558d