Fixes: 154913391 Test: n/a Change-Id: I34a95732ef3e7c20d6549b57230c11f0c3db04d6 (cherry picked from commit d4b62599)