Story 884: Add CTA for edit icon

Change-Id: I51d20099aae9de18608d2cbe8b20c8b6f354e46d
Merge "Story 884: Add CTA for edit icon"