Snap for 7808903 from 7141413c13f654fbca4379efe372e74a764d9e4f to sc-qpr1-release

Change-Id: I7b84d5f4054378df5038d33afe47213dd88d88f7