Backport r190417 for ARM fix