Added support for new API v0.2

Change-Id: Iee623ff657f7cfab4c0a684aaa04f39de1e31c60
Merge "Added support for new API v0.2"