Change-Id: I8dc3fd0e0c1fa4cce70effef254e210a484d965c (cherry picked from commit eb08a743ff1b2f1e53526997e3fb8fc04adecfcb)