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

Change-Id: Ibe043f4ef874873875265e36443ef335eacdeaeb