Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev
am: be09dd77dc

Change-Id: I9dd8c496cb6e9fec63ba370d25faedbcd505dd13