[Bug #1371660]

Change-Id: I5e564c4b71028e38bba2fcfd01a215463f251988