Merge "Fix null IpmemoryService object in AGO project."
am: c28ae5a01d

Change-Id: I33d705a911c08d9a14b54672cd3477d3ad07a211