DESCRIPTION

Override builders from core

Change-Id: I11989d1b48a6a614b06d85326cc7e8f4429e450f


COMMENTS

author: Natasha Sullivan
date: 2016-03-10 11:38:54.922000000

Uploaded patch set 1.

-------------------------------------
author: Tate Garrett
date: 2016-03-10 11:46:35.751000000

Change has been successfully cherry-picked as c1e2a87557587d9f14374e7db7954b3db77358e8

-------------------------------------
