Change-Id: I837688929f29426e6405f0d89ed292a32cde448f (cherry picked from commit 76905f0312ae316cbc9f608b6afca47f76eca4ce)