Change-Id: I83ed917cab71e10eda6a14a4f78ebc56ee894600 (cherry picked from commit 64179562b116f5b16fc223d5d307e5c2f795e6c1)