updates to match repos that I use

Change-Id: I6217011d19cc978dd83e312953375285c35a72f6