Bug: 25337946 (cherry picked from commit 8a7c1606d8) Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
8a7c1606d8