Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add missing init step declaration in manifest

Change-Id: I26c5d2732d1fe0ecb514b431cf3977aa4e4fc554