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

* commit '998944d0e829269387863f44349aafff00e67fce':
  Fix PolicySerializationTest