propagate M7 tweaks to MOTOX

Change-Id: Idb04c9d80b4664b2b0bef5221e1a05f7a29e498b