Merge "Fix tests for low ram devices" into oreo-mr1-cts-dev
am: 8d13ad3911

Change-Id: I170c1c4156642628fa94f2395a80a1c09fb82e9e