Merge "Fix/suppress services/core google-explicit-constructor warnings" am: ffb51ba0f0
am: 14756c26fa

Change-Id: Iecd917842dafbe1f07b25827730d7671fc7e22a3