Merge changes from topic "adapter-features" am: f0f87da0c8
am: 06bec90291

Change-Id: I3f11f0a26cc2d843bfff77ae8f667ca06cc0b3d6