Re ordering for m7 devices for jenkins

Change-Id: I28e13143a9b009cb7087f168c011dd9c5cb9cbef
Merge "Re ordering for m7 devices for jenkins" into kk