Merge changes from topic "presubmit-am-763f564007334da39652c21d4b8cdcb4" into udc-dev

* changes:
  [automerge] Fix parsing zero length IE sub-elements 2p: 5a81604d58
  Fix parsing zero length IE sub-elements