Merge "use ro.persistent_properties.ready for persistent props ready"