Merge "Add minOccurs="0""
am: eebbbea8f0

Change-Id: I34356f5e15a8e72f535c07f3d1c2285d867ba2bc