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

Change-Id: I46d6336cf061cdeb726c19c6b3fe4e730c437429