Hi,

Thank you for the patch.

I've simplified it and made sure that it passed lint, build and test
phases.

Pushed as 833fa80f17dde657bf4712824ae7bcb6b6302913 to master.

--
Oleg