Fix 4.3 merge

Change-Id: Ie63fd04b97ae5670bf5e05cefa6ce735b5ac48a1