Snap for 9018797 from b8a747c8fbe97cb9eb2ef8e969b8e681d032dccf to tm-qpr1-release

Change-Id: I934986fea15f3d4aa733204284be65b8532ff3ff