Merge "Reducing amount of files created in dropbox for keystore" am: 60f9053686 am: cca1a25e53
am: abcb19f651

Change-Id: I14bdcf46b900d6bb3ef31a1c706f0b4b98954783