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

Change-Id: Ibea7a936c7313a38cd5e148ce504106081d47899