Ad-Hoc patch from jl7854

Change-Id: I722aece73d27f7709ce1f704115535cd2cd8dcaa