Update ArticleFeedbackv5 to master

Change-Id: Ie249f1fb54dec1aeba6e742aa4cff1e97a866545