e610: move to common

Change-Id: I47d49d2844e26a5ead7511963c760b2f3c92e238