Merge "Remove CompileTimeIfElse." am: 6d8aff5fdc
am: b810209438

Change-Id: I11f2b631c77914bdf7678a77ab9642eabac0c687