am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev

* commit '2f2864b7b13ee4846a1d95c2c03eeb5752629f21':
  Restored widget provider id not properly updated.