update api code to compatible with new ui (flavor support)

Change-Id: I3e0cec3830482929d83c8b5cdb606f240a5daf2a
Merge "update api code to compatible with new ui (flavor support)" into dev/experimental