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

Change-Id: Ia3fd071997de639604eb1901980b44bffe223655