Bug: 16565964 (cherry picked from commit 118785c6) Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d