Merge "Fix PolicySerializationTest" into gingerbread