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

Change-Id: Ia4077556c23dac7993a18dd423cc1ac56ffbd85e