Snap for 7160100 from a93a992df626678a3bea1162e64801245c2d7d17 to tm-release

Change-Id: If074eee5ef3440f35c9366a338585220cc5cc2eb