Change-Id: I75642f9786ed14e4e6e2048f4a70e7bb49bff03f (cherry picked from commit 31886319c0a3f1adea301e01a9f49834c1c92670)