am ef8dc882: am 0aea616a: Merge "Keep device state always updated" into jb-mr2-dev

* commit 'ef8dc882ec235310737eead979fe913a8ab3465c':
  Keep device state always updated