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

Change-Id: I10274995205ff61e64995bc5be957d9ddad71d1c