Snap for 8249732 from 23166d66dc01778780a8d46bd0bc4ebf2033f2ef to tm-d1-release

Change-Id: I0b349855e8819311ef90add55547dd5806b78603