Merge "Use ifndef or ifeq () instead of ifeq """ am: 1948f64dd5
am: f78a2f821c

Change-Id: Ibd03814549dd6499890eaed07e0bb08e5ce63c6e