Merge "[am] add place holders for new crash stats fields" into sc-dev