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

Change-Id: I4f641ce791d64c7fe78e9938462820e7cd3be419