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

Change-Id: I3f8c5aa77b5244bd797f1b0ba1d96efd597072e9