Merge tag '0.4' into master am: 4edfc03559
am: 5a41dcc69e

Change-Id: Ic5d752c40b170efc1749c5af4062249f262cee5f