couple of cherry picks from google gerrit