fixed bad conflict resolve from fe1edd208e

Change-Id: I51b548cd203068526fc061700c764672fa206725