Snap for 8866741 from 4830cd6ad9d045f6aefd134e41822c570067605d to tm-d1-release

Change-Id: I56b4b95044395a513706d37ef8c9c0c24c810155