Options and directory based CC (#12867 and #12888).

Change-Id: I2c6a36a3f51f1820a4cbe1dc45b7390a0dfb9b84