Merge "init: clarify multiple 'interface' keyword use" am: 83093e7ef8
am: d6525b7107

Change-Id: Ic69bf1b995562de583ffa837f6db14fb0d181057