Change-Id: Ib55fdafbe91f5c1b0fe4601bb9adbf36650f45d4 (cherry picked from commit 789029d55e10b93b762e0dac70fa4b772246fc33)