Fixes bug 26863154 Change-Id: I6b130a8ba6e21e2cbd47551aabf5fc3e31f6f1c0 (cherry picked from commit 6338561c)