Merge "Make operator= and constructor behavior consistent." am: ecfdacd86c am: 7e7e4a3860
am: b419030975

Change-Id: I7944ded56032b4e65aabb407349a54fe1450fdc1