Snap for 7842839 from 8466ade7f9fce92bb1ef8c6fd3dc01968bdf68b9 to tm-d1-release

Change-Id: I9905be39ae9606dc3f297dcab2f1c621d3f418f7