Update 12-14-14

Change-Id: I8709e163701a8b1ffd06e769b065f94aecccb0bd