Bug: 27230989 Change-Id: I4038ba2bbc961623e70f5d55c3ae329f2f30ca39 (cherry picked from commit 5fe29dc2)