Dirty fix for listing products failing.

Change-Id: Icc8da2ed06a9fab6638263d8e648c4482120d2f1
(cherry picked from commit 1c74b08212fa8e26acda0d0c595682ac4e9c366d)