Bug: 34281330 Test: manual inspection, make Change-Id: I7a98ececf4804e3444514ff1c438e5ed4f9705d5
2c826d7