Bug: 21338668 (cherry picked from commit 8981aee6a9) Change-Id: I590d2e76e06b6ba277d7554a119d5351afab1b3f
8981aee6a9