Manually cherry-picked from aom/master: bf2ad75a Change-Id: I99f05e79ec8ad35a49bc124e6dd829ccc7d9cc36