Merge "Fix the IntentTests test case failed" into rvc-dev am: 8b5a3a8529

Change-Id: I4a9e6a63c6b5009a7e0167080566d83e7cebb925