Merge "Temporary stop-gap for Chrome target SDK issue." into sc-dev