Merge commit 'refs/changes/04/4104/3' of https://gerrit.slimroms.net/SlimRoms/frameworks_native into HEAD