Merge "Fix/suppress libs/* google-explicit-constructor warnings" am: a35900fd8e
am: 0aab12591f

Change-Id: I8f22019ad2a92b24ef61e151d5692fbe6e7e387f