Fixes from previous various commit reverts and merges...this should not happen again..

Change-Id: I176acfd386df70e362748c56c4b047a06a89a892
Signed-off-by: k2wl <kar2wlan@gmail.com>