Bring in more of my repos from master

Change-Id: I1f707529a1f10779e9a87f2e26ed9d7621604f7e