Various updates(4.0)

Change-Id: I6cbb234248cfcd1ff0af5759db3fb0979d992ff9