Change-Id: I0b051a4502e48b4278723a1b782f49e0d6a2dffa (cherry picked from commit 3cc7e66059ac9be3cdfbd266563690ec53badc9b)