Patching feature moved on experimental mode

Closes-Bug:#1368275

Change-Id: Ia63a323a1add9043dda99272798cf553f079b298