Merge 81070ca714f70fa4736f4de0aad5be0d993f9275 on remote branch

Change-Id: I0e5897f130a7906025920f2356c0310848f84d8e