fix after merge

Change-Id: Iefce20466e330fd572bdcd793f848eac49518519