Change-Id: Ief04d1ca865621f348fba4ac85fa78bc47465904 (cherry picked from commit 8956e5b8db3059e0872e49f59adc6affc76e2274)