forgot the second part of the patch

Change-Id: I74f30d96b611a7703efd53f0d46b91291dd2c55c