Merge "Revert "Added GVN related attributes to vector nodes."" am: e61682fc56
am: fb4935d497

Change-Id: I5b2f4c9b8756ac0a89854cda585e656aaf3ff8b4