fixes for a failed rebase on the previous patch set.

Change-Id: Ifaf07d4266f2c96d946ed4204cbdf943be10f41b