Claudiu Zissulescu Tue, 09 May 2017 07:23:32 -0700
Committed r247795 including the indicated fixes.
Thank you for your review, Claudiu