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

Change-Id: Ib782048052d38ed739db74a120b6d51537c02c22