vigor: 4.3 updates

Change-Id: I7c3294256f31a21ede5ac61986fd03da766a5790