Merge "Error Check for VLD Symbols Read am: 227c1f82 am: 2743c1ad am: d26de2cd am: 50d29034 am: eb2364e3 am: b06bfd05 am: 67ac3217 am: 059366fe am: 486b5165" into nyc-mr2-dev-plus-aosp