Merge "Workaround for b/36228253"