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

Change-Id: I785c756ad518e4bae277cce40ad4ebca7059afa6