Bug 28592402 Change-Id: I857e46c9ab3ffae0d96923d665d13a4128a6cafa (cherry picked from commit 9a8c42a7)
