am 66b5b5b2: am cb38a97c: am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev

* commit '66b5b5b2b74baa9b7c26d5d72eaa2b6f9f5675dc':
  Ensure accessibility node cache is synced with service state