This commit ports a CLPF change from aom/master by manually cherry-picking: 7560123c066854aa40c4685625454aea03410b18 Change-Id: I61eb08862a101df74a6b65ece459833401e81117