Fix a bad merge

Change-Id: Ic2e9859bd4f4e525bddd42ee4bac8ac92385ea36
Merge topic 'fix_bad_merge' into master

e1d90d07 Fix a bad merge