First commit from Brian

Change-Id: I01d8a868414b970d6ea5b434e7b57b1971e78d26