Change-Id: I703d562b2b70310859dfc16de82af86a126dc058 (cherry picked from commit d038b827f32dd72affc1e2875fb7e57129c256ec)