Merge commit 'goog/readonly-p4-master'