Merge "Break away from longer file extensions."
am: 42b4b94ebf

Change-Id: Ie37ebc9726c6ed432c4d49c9ec7e91fcfc7d7209