Merge "Merge "Fix google-explicit-constructor warnings." am: 0cf9f2b714 am: ee091a8068" into nyc-dev-plus-aosp