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

Change-Id: I9a790f86c51c5d19fa2d8a75e67528fd742be124