[automerger skipped] Merge "Document unspecified dimensions." am: 485c5cd192  -s ours
am: 6a2dc249c7  -s ours

Change-Id: I68f82beb6e0dd3a0705ce59975f3f1525d7c0006