This cleans up several issues raised in comments to I3b2dad3a, mostly style and merge artifacts. Change-Id: I99f5e300a671db1353db151cd187ffd2e4478d03
Change-Id: Ieadadd5300b10a3de856ffd4128bd9fbb09c417e
some tests fail due to logical changes, will fix that in a follow-up Change-Id: I8a5e4087ecf674fbcf6327c5d168cd401be12400