Merge "Detect if num field is valid on v1.0 version." am: 1ae3edd54b
am: 81052a3c85

Change-Id: I3d2463d701a4a1e003064f735601425ab1373ca8