Squashed RIL/blacklist commits from CM