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

Original change: undetermined

Change-Id: I0de0aa0a5848b8dfd50e666581c4390c72abfd02