Bug: 26792072 (cherry-picked from commit 340bd820) Change-Id: I6d1b5aaa4a05e42881aebf9d907fc66fce2144ad