Merge remote-tracking branch 'origin/release_1.24.0'

Change-Id: Ic0ee8bba048fb38d72f8df8bb38efa9de23e0fd9