Merge "Fix/suppress cmds/lshal google-explicit-constructor warnings" am: ff9a870b5b am: daaefc00b5
am: 59a4fc2107

Change-Id: I90efcf286eeb4e4ba54d79ec9617e2435555ce7e