Fail gracefully instead. Fixes test 119. Bug: 22858531 (cherry picked from commit e719926c) Change-Id: If39e0cf146a3bd03bf23646077e9547dd56ec81c