Snap for 7766788 from 13777462ec7ccb886b6cb703e5ff3443f77d6505 to sc-qpr1-release

Change-Id: Id0c3a7ae8624f89c149050d54c231c14b5a6d189