Merge changes from topic "notification_reply_action" into pi-dev
am: 53790c1c8f

Change-Id: Ia6f227ca49a2004a2346da91cfea4f9a3fa65c47