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

Change-Id: I2b7f615d68bfd51432c34ad032f22561a1925b99