am 16a3a82f: am d7147860: am 8affffc7: am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit '16a3a82f38584f652d1b66a55c97eca9b9ea9a1a':
  Remove kxml dependency [DO NOT MERGE]