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

Original change: undetermined

Change-Id: I7e6e29e902c083f77e592c0bdebd14490ef86dc2