Final updates for Android and JavaScript clients