Sync to 0.4.0 across all repos Change-Id: I09a96521a6cc83826fd7168d7544172f075b3e06 Related-Bug: #1896537