RESTRICT AUTOMERGE Manual merge of topic art-service-revert

Change-Id: Iaaae5aaea8a7ee152ea848b5b69ed2208f70b4a9