am 99ca2c61: Merge "Fix PolicySerializationTest" into gingerbread

* commit '99ca2c610588d9f690d8738d965837607641153f':
  Fix PolicySerializationTest