Merge changes from topic 'art_javac' am: 1c15526f61 am: a42934204f am: 3179b553ab
am: 70a1aae0e0

Change-Id: Ifcae6e7a90f993b53cdfb0657d3c18b49428ab0f