bc2fa7229e
This fix some issues with the original change. Change-Id: I35ded85dee4264fd5562a27f25490403137c119c