bug:21867457 (cherry picked from commit 66389fbe) Change-Id: Id01edeb871f6bc59518eb341e5b76f021cfdfe06