Merge \"Fix annotation of getBehavior\" into nyc-support-24.1-dev
am: 807974f78e

Change-Id: Idcb1fe68d3b3818ee5feed1c817d86e39dd32471