Snap for 11091797 from 25e2ab59d464f52afa3f5f9fb27d19fe723b8ac2 to 24D1-release

Change-Id: I3a6a2896fd8ca8fbdfcbb4a600731e61e54b168f