Merge "Fix out of memory error" into rvc-dev am: c78db3777e am: ab878811b1

Change-Id: Iaecac2ce1a3fc0f3703e11bcca21c3bba3eb52d1