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

Change-Id: Ib7aff28ca5088bf5ebbc86ab7ee5c607e35d6a2b