Fix device id for find7, find7u almost ready...

Change-Id: I990427498a8a21ce6f8e038d64ed4859c78b76fd
Fix order

Change-Id: I09cba105fda54e9120a9fa30164670c09f63a133