If the value is nil or empty then the option should NOT exist. This change fixes the logic to determine whether the option already exists which is causing broken idempotency. Closes-Bug: #1987419 Change-Id: I56f85ca35f8e9ee4e5e8d07c714b65f655b1e9ae (cherry picked from commit10202ad22f) (cherry picked from commitf659ea896e) (cherry picked from commitd8d7339ff1)