Although we have some EHABI support since f95e4ad7,
however, there is some enhanced commits after we
have submit the original CL back to upstream. Thus,
we are reverting some part of f95e4ad7, and backport
upstream r167633 and r167904.
Change-Id: I3976b3a15410078803372b735bdaee27dc84a5e0