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

Change-Id: I61956cce7819f4b338e809cdce2585ece08265ce