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

Change-Id: Ic0fdf693f31edc0402c43451610c051b2d8571cf