Cherry-picked from aom/master: e2721a65cbfb5b560cd884d60eb17f53539df5f0 Change-Id: I4ade58be91e7bca0cc4f2bed98a43177d7f590a5