Merge "Follow the minikin namespace changes"