Merge "Fix/suppress bootanimation google-explicit-constructor warnings"