Update ArticleFeedback to master

Change-Id: Ib52874896d2c97acb6f486caf553d502bfa54f76