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

* commit '0aea616acdb228b7a8c061977c0445174f60a1e1':
  Keep device state always updated