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

Change-Id: I625ca2b565e67c280d417ccf50467e2dc8e38448