(cherry picked from commit 9a68a8fb) Bug: 17750026 Change-Id: I82310cea0372cf3061532fbb84ed9edd0060684d