Bug: 17000769 (cherry picked from commit 4fcdc94d) Change-Id: Iccb1fec94fe64ce4c3097510952f275482b86aa9