[automerger skipped] Merge "Moved pollState triggering back into SST" am: 14aa1cbf am: 10e2dc3d
am: 49d0dfd5 -s ours
am skip reason: change_id If720ccb6ed8943ed62e0f1ca041a1b977272fb0a with SHA1 1cd2710c is in history
Change-Id: Ib72ed3b609e64641d5cf1147071b31d55ce029c8