Merge "Fix ARM build problem introduced by CL I3fab6f2b"