Fix: 169660451 Test: Manual Merged-In: I705b56e158dd66cb8084b1efa5f1e7f2195295a2 Change-Id: I705b56e158dd66cb8084b1efa5f1e7f2195295a2 (cherry picked from commit 79593b16)