Rebasing from Google standard to Github