Tech roadmap updates

Change-Id: Ic2cb5a174b10d3f5c3a5741b08b4d6269e3c59b7