It works now and should get the same treatment as the linux version.

Change-Id: I382cc7cae9358ce26e0c2d85acc6a67e991d8118