Fix conditional

Change-Id: Ie14e1a7bbc7b3dd203e3f5505bebf00f963c64e0
Merge "Fix conditional"