Merge "Fix tests affected by sparse.apk"