Imported Upstream version 4.3u1
Merge tag 'upstream/4.3u1'

Upstream version 4.3u1