Merge "SF: Clean up updateTransformHint() processing." into pi-dev
am: 36a1fe93c5

Change-Id: Ie8f8725434a9d2bfcbc838e92f5ee73099fb0318