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

Change-Id: I4e4bc8c78a82e68ebe1ccca48137101aefe0dac2