Merge "Fix tests for low ram devices" into oreo-mr1-cts-dev