Changes before Android submission.