Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9
am: bb8c1a501a

Change-Id: I78bd3c062e9ae89f43dda93ff0d8785cd2cbff70