Snap for 7383690 from 1b90069c45fcd72f6d52a9541578e3a8cf87a4bc to sc-v2-release

Change-Id: If1e8d2737581c4c0a49322c9f2de00c73c6400ed