Make changes stick and optimizations

Change-Id: I634e112104079187beb2b3bacb7b7ca5a9a7b597