Fix Amazon breakage

Change-Id: I881495b40242b4a302179dc448ec1111df685f56