Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d

Change-Id: I2763437122129654485c80b7652729526042321a