Change-Id: I7910bd1064a1b4dbbe2084080c060822ea6f3b48 (cherry picked from commit 9eef19b2ad78b8464da252d0e23c08675898b9d8)