More things from my github

Change-Id: Ibd249b076309aff3421156deb9adbc5bb7938b6d