Use new full_base parent. DO NOT MERGE

Also clean things up a tiny bit.

Change-Id: I14fb49a7b95780d400d57c310e3927ea13a2236a
1 file changed