[Bugfix] fix API-235,242

Change-Id: Ic63b8be16891b9597bb9b6473763351515a36d86
3 files changed