Bug: 19706593 (cherry-picked from commit 85e4e818d8) Change-Id: Icc6d53a99558317b2ec154f931e481ad9fe64aa3
85e4e818d8