Allow optional initial and desired states.

Bugs closed: AURORA-741

Reviewed at https://reviews.apache.org/r/25953/