am 33e3133b: Merge "Enable a memory override through Gservices." into gb-ub-photos-denali

* commit '33e3133bb7161fad5f97880facdf8bea97d930d0':
  Enable a memory override through Gservices.