am: 873c1e9c * commit '873c1e9c': Fix segmentation fault with certain files. Change-Id: Ie5cd114670bb2b20e91c7bc0ac566dae963192ee