Merge changes from topic "fdtrack" am: bd2ac8d335

Change-Id: Ic22a9b7a969c0bd3424cc4ab27403374c86318e8