Snap for 10453938 from d212ec450807f0029bb95cb37040f9126d751761 to mainline-odp-release

Change-Id: I82cb67dbb7acbf706ae5ee9dfc3f7afe83054897