Review updated changes

[Alexandra Sava]

Hi guys,

When you have some time, can you please give some feedback to the
updated changes[1]?




[1]https://reviews.apache.org/r/19357/

Thanks,
Alexandra