This will allow version controling for later API improvement. We will only support version 1 so far. Change-Id: I322e63f6cff157ebb6df5d80625c39bf96ff3659
Change-Id: Id44b7f6d1b8dd073b8ed35e2142a380550f2449b