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

Change-Id: I8133aecde6128949d33653565c64733b74573664