Merge "use a single file for storing persistent properties" am: e1f9a58c86
am: 39088d35ee

Change-Id: I98871252072953ba8f892cdb1feef09a1b59e769