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

Change-Id: I65a4d42c9288f2871427cd458da6cc54e6033115