Merge "Send empty LinkProperties when entering StoppedState." am: efdca004ab am: 72aa5bbd4e
am: ca08e38e3a

Change-Id: Ia33d99f181f67f33b14c0c7552f934b089182c4a