(cherry picked from commit 070274ec0ccb8643c52e41e4119f356f0f51bc36) Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d