Update ArticleFeedback to master

Change-Id: I625198576b17ef6b2f8b1799c6b3dd510771db41