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

Change-Id: Ib0c14d3ef4b6e01ce6e7623a7577dbfa8bc2f3e2