Merge "Fix/suppress renderthread google-explicit-constructor warnings" am: 138aae8eaf
am: 2e2028aee4

Change-Id: I27d1a114816f6ce94751816f7d17720e0a6d8091