Just Archi to slimkat 2

Change-Id: Ieecfdc3aed6aefe6aece269545ed936ffcb5067c