Merge "remove x attribute of java file" am: 554284edf3
am: 52fdb4750a

Change-Id: I09db9140427da70ea3e946a383367533afc81110