Merge changes from topic "art-enable-apex-libs" am: 61a9328e80
am: 1c6de9c328

Change-Id: I01b5031b2fa85ba2b7fd1284a9e91727e4d3ed39