* We were using ' which is not correct Chery-pick of CL: https://android-git.corp.google.com/g/165367