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

Change-Id: I5d2aa57e2d9c157f351cdfd1396944fca8db0784