Merge "Move the "repeated calls" caveat" into pi-dev
am: 7897fa3b9a

Change-Id: Ifbc5e1ffb1093ae9e5abd398dbb3eb190d67142f