Bug: 21173514 (cherry picked from commit 73a93774) Change-Id: If7bd360c396e2594f34efe3a6237f77c7129112b