Use more of my branches

Change-Id: Id08f66e4252aa508ddd408cb9ff9681f891b3d90
Signed-off-by: scott <scott@ubuntu>
Merge remote-tracking branch 'scott/kk44' into HEAD