Merge "Remove overly restrictive check for memory."
am: 78bde50e21

Change-Id: If9d7194beab9e97c9623e70bd2dfa52600be271a