Prepping for emery upgrade to precise.

RT 1791

Change-Id: Ifc0df27fc5860acee79ffa9aadf7b6a8f30944f7