endeavoru: squashed commit to bring repo uptodate

Change-Id: I7677f0bc6615ffc52885a3431c6b26334ae67b24