Bug: 26623636 (cherry-picked from commit 20a4d572) Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f