Committed patchset #1 (id:1) manually as f9249a45cbed1dc55dd52d4cd20b11b1fcb9752d (presubmit successful).