Merge tag '0.4' into master

Bug: 112283442