Bug 10393546. (cherry picked from commit 4ffdc6bd) Change-Id: I02058019be16c07da06cb88654556aac1d7964a8