Finishing update

Change-Id: I65ce5c392a345de33d3e292f9b499e16f4fcd253