Merge "make class and interface Issue-ID: AAF-876 Change-Id: Ife0638c69c55986b1cb1f78...