Bug: 17000769 (cherry picked from commit 9dcc4572) Change-Id: I0a1a4dc7f5d4bb268530840302ecfb1555231e05