Merge "Fix/suppress cmds/lshal google-explicit-constructor warnings"