4.3.1

Change-Id: I9d0687ec85a7969118f338a873b9ae6c163cdd56
Merge remote-tracking branch 'upstream/jb43' into jb43