WIP Brick changes

Change-Id: Ie45889460dd4775a556d592161c98c24a56989c7