Road map updates

Change-Id: I061076c6fa7ecc31da51afd33306c06d91207dc1
Merge "Road map updates"