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

Change-Id: I722279e7ae09334e3cc21f3d810cf2b27636dad1