Change-Id: I34ec516994a5de7accaa5ef7044e443b340bd294 (cherry picked from commit 0d516b30769471d9114214b3a518e2146ff2f25e)