vigor: more 4.3 updates

Change-Id: I5fc346681dc05adc4ae412eef0c114781807a37c