More repos from omni

revert hardware to stock for now

Change-Id: Ied34c78b4feca55159c31eff72489021ba074e64