Change-Id: I8a6b38d3ab1f1711eddb0a4190197f87129fec70 (cherry picked from commit 624914dcdd1e5a931a8eb5d3126c9bde32f4d705)