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

Change-Id: I362e334e0f3da2c3ff8502c05f33768f5004214a