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

Change-Id: I9822b1204b12d2dfca3a0e0fee5d9b9200c668aa