Upstream commit: https://github.com/WhisperSystems/Signal-Android/commit/8af9b7fd156fc1b6597f359a94ea0b26b3afdc9b