[automerger skipped] Merge "Make sure all pollState request handled by handler...
[automerger skipped] Merge "Make sure all pollState request handled by handler thread." am: cc4a0e71 am: f0ab8c0f am: deea3711 -s ours
am skip reason: Change-Id I4763909e24cac74245ba0faae2132e519e6ba223 with SHA-1 bc902137 is in history
Change-Id: I033a16b93a014f06b5c5d33c832c886f67a89473