Merge "Changes for std::vector removal from api" into tizen