Bug: 37544152 Test: the all-knowing eyes of the reviewers Change-Id: I8f5a756a204fe90960700e1dc42f64824d3b844a (cherry picked from commit 60c7dac7)