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

Change-Id: Id364852ed5b81f2594267bbcc8c076c25aabcf0b