Merge "Correcting NumCoeff Check in VLD" into mnc-dev am: c07fc9891f am: 18ccaf3afc am: 581f6ec3f7 am: e40aed2532 am: 65364acb2c am: 3c6cfd86e3 am: 4254a313e4 am: 90e1a0653b
am: e7cb4f3f70

Change-Id: I887a8678e4345d8684afd0f90072d2519cce2018