Snap for 11381838 from 511827318ffd7c866ec917f128f4901124700823 to mainline-odp-release

Change-Id: I7aa34285131f658c73f7e68be39eac31cf66fc43