cherrypick Change-Id: I9e1b530b5cbd43043d326c04bfc30b073bf9d388
fix bug 3295540

Change-Id: I1835444ff6dd0351a0f66ef565fa97a15dfea53f
1 file changed