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

Change-Id: Ib946351005140d59e6a559610aa7448ab19c2630