Snap for 8599125 from 50ed69ec86990fa12d1154d755f18454221c1755 to tm-qpr1-release

Change-Id: Ie8cad00c1cb97dd7d3222fc56798770729d7f64b