Merge "make class and interface Issue-ID: AAF-876 Change-Id: Ife0638c69c55986b1cb1f78fe23e63d0ba4f22ab Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>"