Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e339662247
am: 66c8516600

Change-Id: I9c7175d9e2db45780f14630db43a6ab5672dfe3d