Update 12-8-14

Change-Id: Ia63912944709d96152d46e5b7b485fe26324c8b8