Merge "Tests APK De directory is restored correctly (2/n)"