Snap for 7537076 from 4846fff84d4c6bdf271f20b4b39d707a2f3002de to sc-release

Change-Id: I4376ab55676cba16051f4c8032758324f1df00ff