Merge change I561011bc into eclair

* changes:
  Fix #2176803 - restores from userdebug to user builds not working