Merge "Add a test for persist properties settings" into honeycomb-mr1