Merge "Remove APN from log" into sc-qpr1-dev