Use optional instead of user tags for sta_dk*

Change-Id: I7a28db4b6870c6b1d57fb16130af6c7d605b6834