Merge \"Consistently use SHA256 for filenames (previously, MD5 and SHA1 were used).\" into nyc-dev
am: eefa4f9e51

Change-Id: I6b5caad3ca7c14acf1a81ae2cadab0619a711e93