Loki: Update to 2.0

Change-Id: I31a358309318ec6ce6e95d8c2f4ec13e787fe9ac