Updated and fixed.

Change-Id: I110d4b1bdd8b1da37221bc62ffd4e9b9fc46fccc