Update from CM11.0
seagull: remove common