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

Change-Id: Icf498035d908a908e8e48661c3695de21d0e4062