Change-Id: Ifed4fc2158e9eb003561620504d2d35e07cdd3bd
Fixes bug 956954. Change-Id: Ib5995a01439e564fcb27682976e8e27c8bb7d0d1