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

Change-Id: Ic243f1ae4fc4845e7283dd8f1b2b1eb970e359d8