The former is a maintenance nightmare when branching. Bug:T146293 Change-Id: I8db304fd2f4a19a399975023c5c8b039966b1ab0
Change-Id: I17a81f68916a949b221fd63b2523dde699294d80
Change-Id: If23943dcab86629cccb8926462404d978f8bffa9