Minimal changes

Change-Id: Ida7f582a7fdccba040dd9c1bf58c6e2c241443a2