BUG:25627281 Change-Id: I27e780849ca05b1856b6f9e896c6757766e919e3 (cherry picked from commit 07ed8c01)