Merge oauth branch at r17138 to trunk.