Merge "Fix warning: macro redefined" am: 909ef30a63
am: f62690cdaf

Change-Id: If7255629f0be37af2c08da90e9010423d73decfc