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

Change-Id: I87ca73ae5ca2e5bebe18a682eb0222fcee23a9d0