Provisionally adopted on 11/17.

Also, some related tweaks to fix build errors.

Change-Id: I7d5592450e9284d489b46adc274cd0cfccd04b3c