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

Change-Id: I40f855ff8edfae30fa06344322ed42177d957fad