Change-Id: I6e72f8362bd7f5c2a844cb9e3c4732492314e9f1 (cherry picked from commit 780be14f07df2a3ed6273b96ae857c278fd72718)