Snap for 8756523 from 2f5299fafaa3db1c531ff19417c1790cdd5905ed to tm-d1-release

Change-Id: I1e975178a9b0e72a92a82bb18579caf6aa200a09