Merge "Add wifi_logger and sepolicy path" into sc-dev