Merge remote-tracking branch 'origin/android-4.9-eas-dev' into HEAD

Change-Id: Ibb1184075a0bc01ce86c747d239ba18873538cd9