Merge "[Fix vulnerability] Must validate input for decrypt." into tm-qpr-dev