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

Change-Id: I6a7076c4f76308a6d8faefbd53d8a688457f2035