Merge "liblog: sleep 20ms before critical property_set"