Snap for 7160059 from b757b61ac2514967c958c1106c18f3d1cdcd6964 to sc-v2-release

Change-Id: Ib7b3f6cdd2c6c49530f541deb05039f28972bb83