Merge "Fix test case" into rvc-dev am: bad8a76a51

Change-Id: I93ef85b7fa55d95b92341ca56861352ed0e993ba