Merge changes from topic 'art_javac'
am: 133b4a4971

Change-Id: Id9c94739d1056200188018ee0a55b3b3b1b93d7f