Change com by org

Change-Id: Id56115d9bccca53abbb833bd012803e10dab449e