Merge remote-tracking branch 'remotes/origin/release_1.0.1_java'

Change-Id: Ie75fc441d2363af92b44365d3f4b4630028b141f