This reverts commit 710575c5. Reason for revert: Causes a regression on NCI 1.0 devices Change-Id: I80f5cf1fad45fdc4c7d74d369735758df17e7ace (cherry picked from commit 83be4b6b)