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