9ef1fbb644
Bug: 10094803 (cherry picked from commit 7ee26878065abb494600595349ce58b2b2db3709) Change-Id: I9fbb65d20011f2f625fde3b15ac8c6887dd03ae4