Fixed bug of usage String.isEmpty method which is prohibited for old android devices
Cherry-pick merge
cherry-pick merge