nicki: some stuff

Change-Id: I02006d9e7fb24c55299881dd07dfc009dd896f3f
nicki: update

Change-Id: Id67cc3b13b81cf674849693d48593032f6562d46