fix minor duplication issues

Change-Id: I7703a8fc1abb4067d96d82f390e6987088008622
Merge remote-tracking branch 'upstream/master'