Bug: 15196336 (cherry picked from commit e0099d4d) Change-Id: Ieae2e5c9ba4d5a76120236fd1bd7bd1daacc4a59