Merge "CDD: Updated section related to screen aspect ratio." into nougat-mr1-dev