Merge upsteram brillo-v2017.01 into our branch.

Bug: 38173575