Bug: 17623887 (cherry picked from commit 8cf61dab5f) Change-Id: I91e66ca0c26f04b50308059f9c89d388d55f6e3a
8cf61dab5f