Manually fix automerger error on 4ab7548 am: a6f1c46fa0
am: 5e2beeb8da

* commit '5e2beeb8da3a0a17f9ee4e82c5552309743e38fc':
  init: Add support for ${x.y:-default} expansion

Change-Id: I3878eadcb275fb7543bf68fb3e38d7dda35cad8f