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

Change-Id: I543de7a1c0e3429ca11addd60ae8300d8aedda29