Update 12-20-14

Change-Id: Id64565f21cae2878430a1484831a3ea32aab9c44