Removing options that belong in other extensions

Bug: 47757
Change-Id: Ia8be4967d962176f1e58ee6488f4cc9bfe75b655
Merge "Removing options that belong in other extensions"