Change-Id: Ida8d313e0439c64fd3f272513d053f44701e22be (cherry picked from commit b858db5ba746c370424028814a20c8902e678433)