Merge "Fix NPE when run the testing in IntentPlayground" into rvc-dev am: 44b11dd142

Change-Id: Id29f8e738db01ef7affe6a31be0d28c01782277b