Change-Id: I96eec52472bec122074b0ec2ee051c1b55eaa8f4 (cherry picked from commit 066dacbb3bcb51a5a03b7bdffc4cc49aac4d978b)