Merge changes from topic 'art_javac'
am: 1c15526f61

Change-Id: I15ed85af75588c012dbee383998cae921f656ab9