Use IAtom instead of Atom

Change-Id: If7752313311039a29b3af0b6d88a811f13972832