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

Change-Id: I409fd02854876c68e004cdb62500fdbaffd4085d