Bug: 27693977 (cherry picked from commit d1537b56) Change-Id: Icd25da796fc2c2b7542a47d1d8d3bcbcace145fb