Merge "Re-enable ActiveMapTest for VP10" into nextgenv2