Branch for v4.0?

Change-Id: I77031b54343771899714f98223b79d94d96507bd
Merge "Branch for v4.0?" into v4.0