fixed some changes from the merge

Change-Id: I486fbbe231db7aea3f557f4f9305f21c8ab97cf0