Move the option definitions into a private file

Change-Id: I6a56f5d8871040478033030b79cf0e0ee44c4b9a
Merge "Move the option definitions into a private file"