Update ArticleFeedbackv5 to master

Change-Id: I7f4774e46e09e2820709975e346c728d87839b0d