fork fixes for upstream pull

Change-Id: Ia48a93ccbfea6fdc0791ce25cf3e6291bfe7fa08
more fixes for pull reuest

Change-Id: I1b3d64d79187c414e326928a96427d1cc6176224