Test: Manual Bug: 125027526 Change-Id: I1243495e21780f91a054def8e32c1910878b5eac
mentioned in commit 28d77147