Merge "DO NOT MERGE : Always set sys.usb.ffs.mtp.ready during configure" into oc-mr1-dev
am: ada6dd9ae5  -s ours

Change-Id: I3735f1d471b82cc51d303953f7a799bf5ed65374