Change-Id: I185a3576cdd79864bd8b46711c45acb6186f978d (cherry picked from commit e2bf010ae26dca8cf68b60796f5420df33e6b171)