Merge branch 'javanwhistlingduck'

Change-Id: Ib63fde31ae7b3f71e608830f7433113733b2a275