[automerger skipped] Merge changes from topic "dynamic-output-shape-cherry-pick" am: 3d5a333863 am: ad8189f35a
am: 2819c18f50 -s ours
am skip reason: change_id Ifdb305d849b599c4cce53bd9616d151b067f52fd with SHA1 3f00d03a39 is in history

Change-Id: I5f90a16dac9de7d52ced7d3472e682f85ac4756c