Changes for fixing the android browser issues
resolving conflicts
Changes for fixing android browser issues