Update ArticleFeedbackv5 to master

Change-Id: Ife12af608897d887c7041970de6deb82f09c90a6