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