Snap for 7188367 from df660d593495d41b167e50b570de00e320e68437 to sc-release

Change-Id: I871261f0a8f65df9ed13daccdc59fea65cb97fec