WIP changes 4 to synch with kilo

Change-Id: If3df9e39f6d77706079aa8880b002e86b6261bc0