Bug: 27538761 Bug: 27809626 (cherry picked from commit 5c391cc6) Change-Id: I79b2bdfc8194dc210bc1299b0544f82b2af735b0