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

Change-Id: I520c175f962a3d21c0d497757a398f71f1b3a0c2