Pull request https://github.com/Team-OSE/frameworks_base.git