Commits in grit/mainline:for-marius