Merge changes from topic 'art_javac' am: 1c15526f61
am: a42934204f

Change-Id: Ibbc09be3ad0c18b6f144c1f49a80176023c32aee