Merge "Remove obsolete brillo property" am: 405a40c500 am: 552dd932e3
am: 426b823a90

Change-Id: I935cfbe1a914a9f7e00476542ecccdd8b5764576