Merge commit '888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp * commit '888b702c81b21847b19c4e2845686ed35cc03a0e': Fix #2176803 - restores from userdebug to user builds not working
Merge commit '888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp * commit '888b702c81b21847b19c4e2845686ed35cc03a0e': Fix #2176803 - restores from userdebug to user builds not working