Fixes bug 20660180 Change-Id: I421c246ef776847835ede4be1d72721c35cf951c (cherry picked from commit 0ecd5c20d9)
0ecd5c20d9