Merge "Introduce additional service options for controlling memory cgroups." am: 166ae693d4 am: bf90eac006
am: 573709604d

Change-Id: I7c4c71483c42e8d41b517b63bbf467b456d9970e