Added missing return statement

Change-Id: Idedb48a813600b876eca6066daada035f456a9f0
Merge topic 'vr_plugin_fix' into next

2c26243e Added missing return statement