Remove unused macros am: 561d1d71eb
am: 18ddab89cd

Change-Id: I130e3d019a92af46a60379d5da56de728ef18291