Change-Id: I7e7894b24609709f89064ee5882f055dbb09080b (cherry picked from commit 263e2c692a4b0013766cd1f6b6d7ed674b2b1040)