Merge \\"Remove MTD cruft from init.\\" am: 90db709a2f
am: 80744d867f

Change-Id: Ibc71442293b520a0c351d318d4bcc3bb3bce963c