Code review: 153320043:  Changes for project move.