Update 12-14-14

Change-Id: Ia151a55246b7c864cd46e73d094fb27103cfb469