Merge changes from topic "fdtrack" am: bd2ac8d335 am: 31e9511fe1

Change-Id: Ie53f6dbad108faa4cb447f8d4184e1aa38761150