Bug: 27615840 Bug: 27624868 Change-Id: Id15382753a65a16d438abf514104233441444c8d (cherry picked from commit d5d892d4)