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

Change-Id: I39a4e345a472acddf6089190c09769d6b63f5eb8