[automerger skipped] Merge "Detect if num field is valid on v1.0 version." am: 1ae3edd54b am: 81052a3c85
am: 7920996a4a  -s ours

Change-Id: I6413d0a8d629224b04de24057db801266e7ab6c8