Snap for 14980854 from b4db28f24cf05e24299542c4f05afeb78b5a146c to 26Q2-release

Change-Id: If7914cf834bb01743c64385d6a809b93f96dfcfc