persist options

Change-Id: I1751908ec225b6dd9eacd810b8f75e1991cb854a