Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782 (cherry picked from commit f9662c006c650c9f61f19a5e1ea4a76640eb85ca)