Merge "Fix pulling interval may become 0 in cts" into pi-dev
am: 0421c2cf8f

Change-Id: Ib4b41d6b61df8f8e656d80345e76613b4aa03746