Snap for 8397960 from 712ba8c0c9ceefdf320ffce778de699f005275a4 to tm-release

Change-Id: I27496777a092a510410c902d5a8f79d50d580072