Follows-Up: f4a0eeb648 Bug: Issue 6073 Change-Id: I6d12c50fb2da6687a88f9db794e21996e23744a1
f4a0eeb648