Snap for 10453938 from d58c90fa16bcd0fb807bf99189958df533825337 to mainline-odp-release

Change-Id: Id787ab69cdf5d025171f8f9e5fd2deba451d1429