Update 12-14-14

Change-Id: I14142c8d29737150a60fd491219c0c1c73bff443