Bug: 15616246 (cherry picked from commit 21f1740e) Change-Id: Ib698229cd56151c682d44e8dd59d8df18fb5a393