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

Change-Id: Ie08eba549292e324d87b72cffea6cecaf67940ef