fix merge bug

Change-Id: I23a7ba03a5d7a61db6fbfc170f0b43c8102819cb