Merge "Add support for PSC of serving cell." into gingerbread