am 39006668: am bbebe423: Merge "adb backup/restore fixes" into lmp-dev

* commit '39006668235f9cdeac853911426b1543d3b092d0':
  adb backup/restore fixes