Change-Id: I76aec68cbfb42d239279d7245a03290d691e87a4 (cherry picked from commit d3b1c6319546706c41a2011ead6c3fe208883200)