Fixes: 28530428 (cherry picked from commit 7d5da4b0) (cherry picked from commit 29154b00) Change-Id: Ib8f8da947af804c8b203928e57ed6a8aedbf0684