Merge "Merge "Correcting NumCoeff Check in VLD" into mnc-dev am: c07fc989 am: 18ccaf3a am: 581f6ec3 am: e40aed25 am: 65364acb am: 3c6cfd86 am: 4254a313 am: 90e1a065 am: e7cb4f3f am: 02964c51" into oc-dev-plus-aosp am: bf348735 Change-Id: I24661a447b33a48b04a21e2b8554cc101237626f