Update API: initial support am: 7f92e2b706 am: 89b3354908
am: dbcd91bce9

Change-Id: I72233b9aa015e4c9da03585cdc9777f5d976aefe