Change-Id: Id9d91dda223c43691e1ff40d2b4b0499e270250e (cherry picked from commit 57f654564b8fa58e9c511a7f2799387f96407a50)