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

Change-Id: I481b920cc60f02f6bfa84b373b4b929674d2613a