Merge "Fix setVrThread's exception handling." into nyc-mr1-dev
am: 8d84bc861f

Change-Id: Ie52a81999359574e2c0cff826ae62bc3b7dc247f