Merge "Replace sparsefile with sparseimage" into mnc-dev