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

Change-Id: Id980e9ee25e44e64fd4b100b2323fb52b6bcb60a