Bug: 17000769 (cherry picked from commit 64ad14db) Change-Id: I6404d5050c8a2f4ee6e70d58532eb25ee9de248e