Update roadmap based on Amit's investigation

Change-Id: Ib5d17609e4040539904f9d73a2f3cb0c6ecbf3cb