Fixes for initial wkk monitor bringup in emulation. Change-Id: Ic7b05b8822ef68daee7dd614fcac7a7de7b9b3fa CRs-Fixed: 3087563