Cb 5459

Changes on js code and Android code to align with w3c spec