Update 12-24-14

Change-Id: Icbae188998aec69e0fe77766bc0b8ef7ec4302bf