Update 12-24-14

Change-Id: I47961fa1b396e6ead1c828dd25fa5b367d91e9eb