Change-Id: I4d3649d904a5e9e93e93a0555186319cec65fa10 (cherry picked from commit 4ddaaf8e9dd552930653c93d97e677a5acd6982e)