Merge "sdm: Handle extended range layer."