WIP changes 11 to synch with kilo

Change-Id: Iea1351c4b88b4426dc872c0a00fc99c16512d42b