WIP changes 7 to synch with kilo

Change-Id: I4b20255b36446988d5dfc5a02b97e1c3de917d0e