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

Change-Id: Iac53d2afdb19ed8e2e9d76a68985959b68417b79