Snap for 7788786 from da8e9c11089e4767d399783d64c61f7afe45250c to sc-qpr1-release

Change-Id: I6e2c644a089e6d5ef071ec62db50e465a72d70a3