Merge branch 'release_1.0.1_java'

Change-Id: Ib6fcb84a9e58a58552d1ab54c9f11ba128bbcec7