Merge "Fix/suppress libs/vr google-explicit-constructor warnings" am: dc23aff2d7
am: faec550a58

Change-Id: I785abf359e476df9c47af2284427069178ca9325