review

[Li Li]

Hey, guys,

I wonder if some one can help review my code:
https://reviews.apache.org/r/38339/
https://reviews.apache.org/r/39116/

Thanks,
Li