Merge "Fix NPE when receives null action." am: c5a5dfe2fa am: 4b5a48b93b
am: 9a81de54da

Change-Id: If7c5a40a4343d7ae2c38bcc11c6e6fd2bf81b633