Merge "Add verification before downloading whole package" am: 2e7393dbde
am: e84953e9aa

Change-Id: I71194f48fb58883ab3b64371c4cf9042bf6f84bb