am 7e69f0b3: am 6ef613ed: Merge "Initial implementation of GuidedStepFragment" into lmp-mr1-ub-dev

* commit '7e69f0b36165aab7adcfb0fec93059f1c96cb053':
  Initial implementation of GuidedStepFragment