Merge "Add stable/fraser branch for pharos"