bug:21866529 (cherry picked from commit 3c4ab80c) Change-Id: Ibdc0d4a9730bfc6e7307282276f084dae5ac55c1