Fix bug http://b/issue?id=2160189

Change-Id: I99f3aa5c159e999a2d2bd4526a4540e68af90d1d
2 files changed