bug: 25902983 Change-Id: I3bd4f8566a616597db4545f414b557551d01122d (cherry picked from commit 0d75c64032)
0d75c64032