Update ArticleFeedbackv5 to master

Change-Id: I334b9e93dce7fdf29472640bebd05287abdef1c8