Merge "fs_mgr: use ro.persistent_properties.ready" am: 3f04e9e350
am: 3ae60868ef

Change-Id: Ic3dc54527954ee7271b573b64218d3f45d60272c