Merge "Change contacts version and target SDK to 25 (1/2)"