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

Change-Id: I4c8cb0515fce44ed594e4a92362e0a267a31495a