also need correct typing

Change-Id: Ibcfe6f1a26a536567669a5c84252308ed47f0696
Merge "also need correct typing" into production