Snap for 7860154 from 378d3c4e7dc2a66e2a9ad363868b0f9607782fa3 to tm-release

Change-Id: Ic4052b89c20912aec23168b14e8f28ed372e8b28