Merge "Reduce persist threshold for lower warning/limit." into jb-dev am: 04536e49a0 am: fb0656090d

Original change: undetermined

Change-Id: I754a16fd5b972c37f7bb080e056841275c496b4f