MP1-4554: Trying to get stuff working.

Change-Id: I425961b80be2577fce8bac2d1069a6149afd319d