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

Change-Id: Ifc6354b11efcf073f4dafb4dd69a735f8d525b87