Merge "Fix dodge rect contains check am: c88a088913 am: b9873fc81b am: 1118b665b3" into nyc-mr2-dev-plus-aosp