Merge "Fixing test cases failed at low ram device" into stage-aosp-rvc-ts-dev