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

Change-Id: I486787fd14a75b27a7ab592411bd9188982abe5d