Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274 (cherry picked from commit d2a1edf5369707b53f63778a029bf70c25551bb6)