Snap for 9744320 from db3d8d21584d84ef71bff3f305e38128856993dc to tm-qpr3-release

Change-Id: I387190998f5c2de2bc4149ee9788a5a7e4c61e29