Finally recovered from bad merge

Change-Id: I6b597cb36b35ade26c2eb47440c1a54d53d48577