Merge "init: annotate intended fallthrough"
am: 903eb5125e

Change-Id: Ie0189a668cb4933a413a19fc75f9c73e9ed30819