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

Change-Id: Ia99eeb2a702eda474623100993bb4b4939125236