Merge "Revert "Downstream Workaround for Qualcomm Bug 10205015""