Snap for 10453938 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-odp-release

Change-Id: Ie5e8f11862d6c9e11de47c1010fdb810d33f337d