Fixes bug 27060816 Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33 (cherry picked from commit 0918e5d650)
0918e5d650