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

Change-Id: I1313428b2cc358a62d3514a9d3a5c9bf260995ba