Merge "[conflict] [conflict] Export java souces to fix several broken tests. 2p: 8ebbedca84 am: bb6527a89b am: b59f7cb959"