Update 12-22-14

Change-Id: I578df948971120ba168df18654ef84009c4772a6