v4.0.1-rc branch point (hopefully not broken)

Change-Id: I822a232201855c1afae916de55c3ec00939d060d