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

Change-Id: I6ae9e8e8d30df6739e59bed20c139616acd4a250