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

Change-Id: I439c26d883b743014d92199d3a32d8b5c9a18a72