Merge "Adding support for 213dpi" into oreo-cts-dev