Merge "Use ReadFileToString() in GetHash()" am: 9b9854a80a
am: 32acbcc687

Change-Id: I362b1710fa9494fd2a8aa56ebdfcdd62204111f5