change extra module tags to optional

Change-Id: I8fc22559d9b90ba1736cab9df93c5755362433a0