ART: Add apex defaults am: e55ea985ab am: be27066c64
am: 115c047871

Change-Id: Ie65794cdb2322d7b132b152f2af36700575e0718