Change-Id: I9a78703b1f01394fa95c804da7e787ce1fd61644 (cherry picked from commit c4c694d5615b4e98cd9a298522267232dd9a9e0f)