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

Change-Id: If232f981293c6a910e9606fa079c8394b7fa6afe