Change-Id: Ia6a3f05c9a7e797d8190123d304ecc4e2b018e33 (cherry picked from commit 44825f096068dfc17fe4dcfb7db3d775b08fa7a0)