Bug: 17000769 (cherry picked from commit 84d7605f) Change-Id: I89c26a905af12ea288742368c2c038afd57a879a