Fix breakage on beta due to type hint being too strict

Change-Id: I2ed0b80e61fed2dfca00095ff172a7f1d047250f