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

Change-Id: I5641a5974159770baef5bbf7a489bbf816f97ca7