partial commit

Change-Id: I170be01cf4f89f538bed6cd2fc2be9876cacca22