Rebase, onto current vanir/kk44 with all my needs

Change-Id: Ib9948dd7c89091857a572ae4ba9e9137c6b5ed75