Revert "Revert "fix the bionic""

This reverts commit 3d55c163fd3cbd39398e21013333f1618aea6e7d.

Change-Id: I5130823ae08968c4298fdfa681ed1c731f2c00df
Merge "Revert "Revert "fix the bionic""" into jaf-1.1