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

Change-Id: If5f6703d481cfee0bfbfb7d91bb8477e2eb5b660