Fixes: 182418325 Test: go test android_products_test.go Change-Id: Ibb6c4aedacb891d5d7e74ce351b2e19c888adc5d