Alok, please take a look. (I will add the version.h update upon landing.)
lgtm
Committed patchset #2 manually as r7343887 (presubmit successful).