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

Change-Id: I5c673678f4d418b7197c7fd08788f822572e684c