Bug: 17565501 (cherry picked from commit 63582f21) Change-Id: Ie1196191d92286e543ed099c7d1ea4712802912d