Merge "subcount() no longer works for strings." into pi-dev
am: b2999d2c1d

Change-Id: I366801f0fce64cf5d15bb017bb8c98f018edc219