Fix broken feature dependencies.

Change-Id: I8fe77e5f0718e64ee03464e213dbd7f49755db9d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Merge "Fix broken feature dependencies."