Merge "Fix/suppress binder google-explicit-constructor warnings" am: a591cd824a
am: fb1be05603

Change-Id: Id4df44ca215f0e8de023ab355c950c5d6b4bc4e1