CM upstream merges: Add I605 and L900