Merge "init: error log on by-name identical replacement"
am: 34ffa7e074

Change-Id: I8e734a80f064f32a594d3bff2bc755acde6de8ef