Bug: 17000769,16875245 (cherry picked from commit debdda02) Change-Id: I158f090c89587f176813a15e9edad917bd134cd0