BUG=25641461 Change-Id: Ied83462465883268e68c6d980f2a1d0e2aa7ea22 (cherry picked from commit 9f9e75e8)