4.8 android-ebai

Change-Id: Ifefafcd48274b6d330cc6dea56f467440c930830