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

Change-Id: I7a63deb14b0e9727e53c5c1a01a20c83a86d26e5