Update ArticleFeedbackv5 to master

Change-Id: I4fba46d3f67c4e20138aeb58b44c1003d52dc08c