Reconcile Mako + HH for L

From Muppets

Change-Id: Iffb834e384126f43ede8f75705b254dd9efff4bf