Snap for 7160059 from cf59776627100b46a12e2399a8815b83a0f02abd to sc-release

Change-Id: If5c438222009d85babe07c2f7a0c99d56b6f5ce2