This fixes issue 2410711. Change-Id: I01161b3febc02914f2c7a9ed3c4c9ae121ce181a Signed-off-by: Iliyan Malchev <malchev@google.com>