WIP changes 17 to synch with kilo

Change-Id: I40c605393eaaa0e3f7ac8179c4a5d1f623c56337