This is a follow-up patch of 7710faa45640d25a83136a35044aafdb1b168d88.

Change-Id: I1f54cbe5c3170e9a79e11e9b9c1da3791419a4ba