am 814b544e: am 99ca2c61: Merge "Fix PolicySerializationTest" into gingerbread

* commit '814b544e56f0976a301043e3d1a6c4a2b9afbb6b':
  Fix PolicySerializationTest