Merge "Fix the IntentTests test case failed" into rvc-dev am: 8b5a3a85 am: d7a26d3f am: 92125c75 am: 4875ce8e Change-Id: I1cffcd06c3cbce9a374a140137ea99626ed0f020