WIP changes 16 to synch with kilo

Change-Id: I9c135d32f4ade0e2e50b98e90b29032270fe042f