Bug: 14298175 (cherry picked from commit ddfc32a2) Change-Id: I901e35bc43fbc18be3052863429897f133c8d37d