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

Change-Id: I37c4bb671c6181246fc28d37d809392ad0e1c361