Merge "Send empty LinkProperties when entering StoppedState." am: 59ccf1041f am: 48b64fd9f2
am: a5b35c7850

Change-Id: I01995b2b18154877792a2dffed0a19642264a758