Update 12-8-14

Change-Id: I678fdcb96edd4e782e1931591334dd58b39b15ec